Make stock_size an uint property, to allow custom icon sizes. Also clarify

Sun Feb 15 00:49:59 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_class_init):
	Make stock_size an uint property, to allow custom icon
	sizes. Also clarify the blurb.  (#130047, Erik Grinaker)

diff --git a/ChangeLog b/ChangeLog
index c4d8891987b6b2756da521c0c4e4921b35eba6d0..b165aad97de5a9372d44ebffbeda3ce98e8d3a00 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb 15 00:49:59 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_class_init): 
+       Make stock_size an uint property, to allow custom icon 
+       sizes. Also clarify the blurb.  (#130047, Erik Grinaker)
+
 Sat Feb 14 11:05:26 2004  Manish Singh  <yosh@gimp.org>
 
         * configure.in: Remove unnecessary STRIP_* definitions, and GNU

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c4d8891987b6b2756da521c0c4e4921b35eba6d0..b165aad97de5a9372d44ebffbeda3ce98e8d3a00 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Feb 15 00:49:59 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_class_init): 
+       Make stock_size an uint property, to allow custom icon 
+       sizes. Also clarify the blurb.  (#130047, Erik Grinaker)
+
 Sat Feb 14 11:05:26 2004  Manish Singh  <yosh@gimp.org>
 
         * configure.in: Remove unnecessary STRIP_* definitions, and GNU

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c4d8891987b6b2756da521c0c4e4921b35eba6d0..b165aad97de5a9372d44ebffbeda3ce98e8d3a00 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun Feb 15 00:49:59 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_class_init): 
+       Make stock_size an uint property, to allow custom icon 
+       sizes. Also clarify the blurb.  (#130047, Erik Grinaker)
+
 Sat Feb 14 11:05:26 2004  Manish Singh  <yosh@gimp.org>
 
         * configure.in: Remove unnecessary STRIP_* definitions, and GNU

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c4d8891987b6b2756da521c0c4e4921b35eba6d0..b165aad97de5a9372d44ebffbeda3ce98e8d3a00 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Feb 15 00:49:59 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_class_init): 
+       Make stock_size an uint property, to allow custom icon 
+       sizes. Also clarify the blurb.  (#130047, Erik Grinaker)
+
 Sat Feb 14 11:05:26 2004  Manish Singh  <yosh@gimp.org>
 
         * configure.in: Remove unnecessary STRIP_* definitions, and GNU

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c4d8891987b6b2756da521c0c4e4921b35eba6d0..b165aad97de5a9372d44ebffbeda3ce98e8d3a00 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Feb 15 00:49:59 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_class_init): 
+       Make stock_size an uint property, to allow custom icon 
+       sizes. Also clarify the blurb.  (#130047, Erik Grinaker)
+
 Sat Feb 14 11:05:26 2004  Manish Singh  <yosh@gimp.org>
 
         * configure.in: Remove unnecessary STRIP_* definitions, and GNU

diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index 64da59d583161eec7fcf6f34c8fba6f6b8f5ccbe..7f344dcbedb6be304cc86d6f48e7b57410eb0c9c 100644 (file)
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -164,10 +164,11 @@ gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class)
 
   g_object_class_install_property (object_class,
                                   PROP_STOCK_SIZE,
-                                  g_param_spec_enum ("stock_size",
+                                  g_param_spec_uint ("stock_size",
                                                      P_("Size"),
-                                                     P_("The size of the rendered icon"),
-                                                     GTK_TYPE_ICON_SIZE,
+                                                     P_("The GtkIconSize value that specifies the size of the rendered icon"),
+                                                     0,
+                                                     G_MAXUINT,
                                                      GTK_ICON_SIZE_MENU,
                                                      G_PARAM_READWRITE));
 
@@ -231,7 +232,7 @@ gtk_cell_renderer_pixbuf_get_property (GObject        *object,
       g_value_set_string (value, priv->stock_id);
       break;
     case PROP_STOCK_SIZE:
-      g_value_set_enum (value, priv->stock_size);
+      g_value_set_uint (value, priv->stock_size);
       break;
     case PROP_STOCK_DETAIL:
       g_value_set_string (value, priv->stock_detail);
@@ -294,7 +295,7 @@ gtk_cell_renderer_pixbuf_set_property (GObject      *object,
       priv->stock_id = g_strdup (g_value_get_string (value));
       break;
     case PROP_STOCK_SIZE:
-      priv->stock_size = g_value_get_enum (value);
+      priv->stock_size = g_value_get_uint (value);
       break;
     case PROP_STOCK_DETAIL:
       if (priv->stock_detail)